Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / common / LoginInterface.java

diff --git a/ruralHouses client/src/common/LoginInterface.java b/ruralHouses client/src/common/LoginInterface.java
new file mode 100644 (file)
index 0000000..bb5e3e0
--- /dev/null
+++ b/ruralHouses client/src/common/LoginInterface.java
@@ -0,0 +1,15 @@
+package common;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+import domain.Account;
+
+public interface LoginInterface extends Remote {
+       
+       public Account checkCredentials(String usr, String pwd)throws RemoteException;
+
+       
+       
+       
+}